simple-ui: fix NPE on filters #2635
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
flobz
reviewed
Aug 29, 2025
Comment on lines
119
to
126
| .map(e -> { | ||
| .filter(e -> { | ||
| if (e.getValue() instanceof Optional<?> opt) { | ||
| e.setValue(opt.orElse(null)); | ||
| return opt.isPresent(); | ||
| } else { | ||
| return e.getValue() != null; | ||
| } | ||
| return e; | ||
| }) | ||
| .filter(e -> !ObjectUtils.isEmpty(e)) | ||
| .filter(e -> !(e.getValue() instanceof Collection<?> coll && coll.isEmpty())) |
There was a problem hiding this comment.
I made this changes because Sonar was complaining about complexity.
I need to test it more but I think that the fix could be just:
.stream()
- .map(e -> {
- if (e.getValue() instanceof Optional<?> opt) {
- e.setValue(opt.orElse(null));
- }
- return e;
- })
- .filter(e -> !ObjectUtils.isEmpty(e))
+ .filter(e -> !ObjectUtils.isEmpty(e.getValue()))
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));There was a problem hiding this comment.
Understood, your fix should work
|
avgustinmm
approved these changes
Sep 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since commit d2b8e74 an NPE was introduced on the filters. If no filter is provided, the views other than targets raise NPE.
I reverted the changes on the impacted lines to a proper Optional check.If any of you understands the change and why relying on null here, I'll be glad to update the code to match the desired new behavior.